# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.1046.15.69 -> 1.1046.15.70
#	      fs/proc/base.c	1.44    -> 1.45   
#	          fs/fcntl.c	1.25.1.2 -> 1.25.1.3
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/06/10	eranian@hpl.hp.com	1.1046.77.76
# [PATCH] ia64: fix NULL pointer dereferences in perfmon
# 
# This patch fixes some NULL pointer
# problems in perfmon.
# 
#  - fixes NULL pointer derefence in perfmon_mckinley.h when context is not
#    loaded
#  - fixes typo in pfm_write_pmcs()
# --------------------------------------------
# 03/06/10	davidm@tiger.hpl.hp.com	1.1046.15.70
# Remove include of <asm/unistd.h> now that force_successful_syscall()
# is back in ptrace.h.
# --------------------------------------------
#
diff -Nru a/fs/fcntl.c b/fs/fcntl.c
--- a/fs/fcntl.c	Mon Sep 22 13:00:44 2003
+++ b/fs/fcntl.c	Mon Sep 22 13:00:44 2003
@@ -16,7 +16,6 @@
 #include <asm/poll.h>
 #include <asm/siginfo.h>
 #include <asm/uaccess.h>
-#include <asm/unistd.h>
 
 extern int fcntl_setlease(unsigned int fd, struct file *filp, long arg);
 extern int fcntl_getlease(struct file *filp);
diff -Nru a/fs/proc/base.c b/fs/proc/base.c
--- a/fs/proc/base.c	Mon Sep 22 13:00:44 2003
+++ b/fs/proc/base.c	Mon Sep 22 13:00:44 2003
@@ -33,8 +33,6 @@
 #include <linux/security.h>
 #include <linux/ptrace.h>
 
-#include <asm/unistd.h>
-
 /*
  * For hysterical raisins we keep the same inumbers as in the old procfs.
  * Feel free to change the macro below - just keep the range distinct from